From a73649ea7d1c9e647957589b50eb51b9dfe1da9f Mon Sep 17 00:00:00 2001 From: Fabio Fantoni Date: Tue, 27 May 2014 17:01:39 +0200 Subject: [PATCH] libxl: disable usbredirection if spice is disabled Now if usbredirection is enabled in domU's xl cfg is added also if spice is disabled and then usbredirection remain unused. This patch if usbredirection is enabled but spice not disable usbredirection and show a warning. Signed-off-by: Fabio Fantoni Acked-by: Ian Campbell [ ijc -- simplified log message ] --- tools/libxl/libxl_create.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/tools/libxl/libxl_create.c b/tools/libxl/libxl_create.c index da1517c9f1..d6b8a29914 100644 --- a/tools/libxl/libxl_create.c +++ b/tools/libxl/libxl_create.c @@ -292,6 +292,13 @@ int libxl__domain_build_info_setdefault(libxl__gc *gc, libxl_defbool_setdefault(&b_info->u.hvm.usb, false); libxl_defbool_setdefault(&b_info->u.hvm.xen_platform_pci, true); + libxl_defbool_setdefault(&b_info->u.hvm.spice.enable, false); + if (!libxl_defbool_val(b_info->u.hvm.spice.enable) && + (b_info->u.hvm.spice.usbredirection > 0) ){ + b_info->u.hvm.spice.usbredirection = 0; + LOG(WARN, "spice disabled, disabling usbredirection"); + } + if (!b_info->u.hvm.usbversion && (b_info->u.hvm.spice.usbredirection > 0) ) b_info->u.hvm.usbversion = 2; @@ -324,7 +331,6 @@ int libxl__domain_build_info_setdefault(libxl__gc *gc, libxl_defbool_setdefault(&b_info->u.hvm.sdl.opengl, false); } - libxl_defbool_setdefault(&b_info->u.hvm.spice.enable, false); if (libxl_defbool_val(b_info->u.hvm.spice.enable)) { libxl_defbool_setdefault(&b_info->u.hvm.spice.disable_ticketing, false); -- 2.30.2